Autogenerated HTML docs for v1.7.4
diff --git a/git-merge-file.html b/git-merge-file.html index 31a99be..3c0d5ba 100644 --- a/git-merge-file.html +++ b/git-merge-file.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-merge-file(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-merge-file(1)</title> </head> <body> <div id="header"> @@ -318,22 +412,24 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git merge-file</em> [-L <current-name> [-L <base-name> [-L <other-name>]]] +<div class="verseblock-content"><em>git merge-file</em> [-L <current-name> [-L <base-name> [-L <other-name>]]] [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] - <current-file> <base-file> <other-file></div></div> + <current-file> <base-file> <other-file></div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p><em>git merge-file</em> incorporates all changes that lead from the <tt><base-file></tt> +<div class="paragraph"><p><em>git merge-file</em> incorporates all changes that lead from the <tt><base-file></tt> to <tt><other-file></tt> into <tt><current-file></tt>. The result ordinarily goes into <tt><current-file></tt>. <em>git merge-file</em> is useful for combining separate changes to an original. Suppose <tt><base-file></tt> is the original, and both <tt><current-file></tt> and <tt><other-file></tt> are modifications of <tt><base-file></tt>, then <em>git merge-file</em> combines both changes.</p></div> -<div class="para"><p>A conflict occurs if both <tt><current-file></tt> and <tt><other-file></tt> have changes +<div class="paragraph"><p>A conflict occurs if both <tt><current-file></tt> and <tt><other-file></tt> have changes in a common segment of lines. If a conflict is found, <em>git merge-file</em> normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like this:</p></div> @@ -345,21 +441,21 @@ lines in file B >>>>>>> B</tt></pre> </div></div> -<div class="para"><p>If there are conflicts, the user should edit the result and delete one of +<div class="paragraph"><p>If there are conflicts, the user should edit the result and delete one of the alternatives. When <tt>--ours</tt>, <tt>--theirs</tt>, or <tt>--union</tt> option is in effect, however, these conflicts are resolved favouring lines from <tt><current-file></tt>, lines from <tt><other-file></tt>, or lines from both respectively. The length of the conflict markers can be given with the <tt>--marker-size</tt> option.</p></div> -<div class="para"><p>The exit value of this program is negative on error, and the number of +<div class="paragraph"><p>The exit value of this program is negative on error, and the number of conflicts otherwise. If the merge was clean, the exit value is 0.</p></div> -<div class="para"><p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it +<div class="paragraph"><p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it implements all of RCS <em>merge</em>'s functionality which is needed by <a href="git.html">git(1)</a>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -L <label> </dt> <dd> @@ -372,7 +468,7 @@ from files a, b and c. </p> </dd> -<dt> +<dt class="hdlist1"> -p </dt> <dd> @@ -381,7 +477,7 @@ <tt><current-file></tt>. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> <dd> @@ -389,13 +485,13 @@ Quiet; do not warn about conflicts. </p> </dd> -<dt> +<dt class="hdlist1"> --ours </dt> -<dt> +<dt class="hdlist1"> --theirs </dt> -<dt> +<dt class="hdlist1"> --union </dt> <dd> @@ -408,8 +504,8 @@ </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> git merge-file README.my README README.upstream </dt> <dd> @@ -418,7 +514,7 @@ tries to merge them and writes the result into README.my. </p> </dd> -<dt> +<dt class="hdlist1"> git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345 </dt> <dd> @@ -431,20 +527,20 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Johannes Schindelin <johannes.schindelin@gmx.de></p></div> +<div class="paragraph"><p>Written by Johannes Schindelin <<a href="mailto:johannes.schindelin@gmx.de">johannes.schindelin@gmx.de</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>, +<div class="paragraph"><p>Documentation by Johannes Schindelin and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>, with parts copied from the original documentation of RCS <em>merge</em>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:49 UTC +Last updated 2010-03-20 20:59:08 UTC </div> </div> </body> 